From e7a266ad95325d7407f1a478fab4749d034606c8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 8 Sep 2015 06:15:12 -0400 Subject: [PATCH] css color: Use gtk_internal_return_if_fail --- gtk/gtkcsscolorvalue.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index 1f92eab55e..7e78134580 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -25,6 +25,8 @@ #include "gtkstylepropertyprivate.h" #include "gtkwin32themeprivate.h" +#include "gtkprivate.h" + typedef enum { COLOR_TYPE_LITERAL, COLOR_TYPE_NAME, @@ -141,8 +143,8 @@ _gtk_css_color_value_resolve (GtkCssValue *color, { GtkCssValue *value; - g_return_val_if_fail (color != NULL, NULL); - g_return_val_if_fail (provider == NULL || GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); + gtk_internal_return_val_if_fail (color != NULL, NULL); + gtk_internal_return_val_if_fail (provider == NULL || GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); switch (color->type) { @@ -466,7 +468,7 @@ _gtk_css_color_value_new_name (const gchar *name) { GtkCssValue *value; - g_return_val_if_fail (name != NULL, NULL); + gtk_internal_return_val_if_fail (name != NULL, NULL); value = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_COLOR); value->type = COLOR_TYPE_NAME; @@ -481,7 +483,7 @@ _gtk_css_color_value_new_shade (GtkCssValue *color, { GtkCssValue *value; - g_return_val_if_fail (color->class == >K_CSS_VALUE_COLOR, NULL); + gtk_internal_return_val_if_fail (color->class == >K_CSS_VALUE_COLOR, NULL); value = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_COLOR); value->type = COLOR_TYPE_SHADE; @@ -497,7 +499,7 @@ _gtk_css_color_value_new_alpha (GtkCssValue *color, { GtkCssValue *value; - g_return_val_if_fail (color->class == >K_CSS_VALUE_COLOR, NULL); + gtk_internal_return_val_if_fail (color->class == >K_CSS_VALUE_COLOR, NULL); value = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_COLOR); value->type = COLOR_TYPE_ALPHA; @@ -514,8 +516,8 @@ _gtk_css_color_value_new_mix (GtkCssValue *color1, { GtkCssValue *value; - g_return_val_if_fail (color1->class == >K_CSS_VALUE_COLOR, NULL); - g_return_val_if_fail (color2->class == >K_CSS_VALUE_COLOR, NULL); + gtk_internal_return_val_if_fail (color1->class == >K_CSS_VALUE_COLOR, NULL); + gtk_internal_return_val_if_fail (color2->class == >K_CSS_VALUE_COLOR, NULL); value = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_COLOR); value->type = COLOR_TYPE_MIX; @@ -532,7 +534,7 @@ _gtk_css_color_value_new_win32 (const gchar *theme_class, { GtkCssValue *value; - g_return_val_if_fail (theme_class != NULL, NULL); + gtk_internal_return_val_if_fail (theme_class != NULL, NULL); value = _gtk_css_value_new (GtkCssValue, >K_CSS_VALUE_COLOR); value->type = COLOR_TYPE_WIN32; -- 2.30.2